Merge "Call WindowManagerInternal#waitForAllWindowsDrawn for secondary displays" into sc-dev