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