Merge "Handle media in landscape" into main