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

Change-Id: I5f8b4625532ca390f30a94efd9cc0788abfcfc0a