Merge "Call stop() before calling setPositionMode()" into main