Merge "Tint wrap all Views when running on < v21" into mnc-ub-dev