Merge "Allow screenOffScan to holders of MEDIA_CONTENT_CONTROL" into main