Merge "Stop preventing scans when the screen is off" into main