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

Change-Id: I6a105898193544119e3ca7a911faed67e46e539d