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

Change-Id: Iea1515f11646a38bf7252ac7ee547296aeddced1