Merge "Ensure Compat MediaStyle Large Icons are shown pre-API 21" into mnc-ub-dev