Merge "Rename media control flag" into sc-dev