Merge "Fix window animation flash issue" am: 1a02a26838 am: bb5f6db56a am: 63993f20a4
am: b3ec06630c

Change-Id: I4ce2edb5ad4154676adf58f13447ffd19159d67e