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

Change-Id: Ifeac639bd3d5b3dcd969beb0a6f9168c7971e5cf