Merge "Add metric constants for cross profile settings page" into rvc-dev