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

Change-Id: Ib6a4dcb09317891decacff94340ac8b015b8db74