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

Change-Id: Iabeab79445e736401ba39cc09331bdbf501c66af