Merge "Update setOrganizationColor javadoc" into rvc-dev