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

Change-Id: I5dc7565f6fb7faae96e54bafcfa2a1bdcf3b389e