Merge "Fix issues with media control size" into sc-dev