Merge "Tie windowing transitions to visual indicator." into main