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

Change-Id: Iea47c85999a4584ba878761710a175d925d0809a