Merge "Fix weight of media to be 1 in landscape" into sc-dev