Merge "Fix media side clipping on large screen portrait" into tm-dev