Merge "Metrics constants for new zen screen" into pi-dev am: 11e2010547
am: a9dbb0c7a7

Change-Id: I3e8ff59d7d4bc664da46bbae8cd4d45aa9dc4b2a