Merge "Fix clipping during media squishing and general behavior" into tm-qpr-dev