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

Change-Id: I4b9d03bd48c6fb4a676c8ef3746fd757eb1f3943