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

Change-Id: I085af51f23b39f9f53ec12a80ae95abf7d38403b