Merge "Media doesn't clip based on shade footer" into tm-qpr-dev