Merge "Fix window transformation related issue" am: 8760e60da5 am: 1200cfb48d am: a4a4cfc8f5
am: 8d4fa7f6b6

Change-Id: Icd2d42a026c4f514cc3efbd5883fcf4a0ee7d0e2