Merge "Adjust media layout to spec" into sc-dev