Merge "[waitForAllWindowsDrawn] Wait for transitions only on default displays" into main