Merge "Revert "Scan manager: Suspend scan when location is off"" into pi-dev