Merge "Use the compat tinting for DrawableContainers on 5.0" into lmp-mr1-ub-dev