Merge "Removes user icon tinting." into tm-qpr-dev