Merge "Fix race in TelephonyScanManager"