Merge "Metrics constants for new settings screens"