Merge "Media layout changes for tablets" into tm-dev