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

Change-Id: I1b9bd15111c7d4d9326c1cb1fc64174c78e52939