Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev