Merge "Fix window animation flash issue"
am: 1a02a26838

Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2