Merge "WM: Fix WindowStateTests#testSeamlesslyRotateWindow"