Merge "Refine getTransformationMatrix for windows in a re-parented display" into qt-dev
am: 090cb13600

Change-Id: I747cbbc4a06a2beedf0a9e620ef4fc7e46639cc4