Merge "Fix for avatar tinting"