Merge "Close floating views before fake rotation" into main