Merge "Allow apps holding OP_PROJECT_MEDIA to record lock screen" into main