Merge "Block relayout during Recents transition" into main