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

Change-Id: I594663891a1e065a337f438afcc9e6924226bd9f