Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev