Merge "Push startScan and stopScan down into InfoMediaManager" into main