Merge "Fix weird shelf truncation when only media can show." into tm-qpr-dev