Merge "Ensure we wipe out our internal tinting if the background changes" into lmp-mr1-ub-dev