Merge "Correct pointer position" into qt-dev am: 1add7b84d5
am: f601488178

Change-Id: Icf7fbe852e81f0d5da2c9208c979e0ed65d6da2d