Merge "User avatar didn't have enough contrast" into oc-dr1-dev