Merge "Add new permission MANAGE_MEDIA" into sc-dev