Merge "Defer transition ready when during applyTransaction" into main