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

Change-Id: I686b637ea76402c4d4c666b60ece83755a24a5d1