Merge "Also update color when changing the visibility" into rvc-dev