Merge "Support collapsed media in landscape" into main