Merge "Metrics constants for new zen screen" into pi-dev