Merge "Catch the RuntimeException for stopScan()" into pi-dev