[automerger] Merge "Prevent showing windows while animating to avoid color...
[automerger] Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev am: 58150a7e am: f3ebcb59
Change-Id: Iabeab79445e736401ba39cc09331bdbf501c66af