Merge "Change names of stopTune and stopScan"