Merge "Fix setPositionListener race condition" into qt-dev
am: 2c52298236

Change-Id: I93fb56c0e171ffc291962a3aa872ffb650545762