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

Change-Id: Ide2626dfb2726c7b1d92bce8e88d20c2c985801a