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

Change-Id: I02e61ad1e4759433fa39cb8d16e8926382d415f8