Merge "Decouple screen and location checks in ScanManager." into sc-dev