Merge "Ignore splitscreen resize scenario if there is no matching transition" into main