Merge "Don't start network scan timer when in SIM lock state" into main