Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev am: 58150a7e6e
am: 8897621da4

Change-Id: I5df4d999aeb2acb702af78ab3de308380dd5904a