Merge "Enables metrics only when shortcut view is enabled."
am: 8c3767d4cd

Change-Id: I72a7cfc8dc0111e607a57622b6803ccca531ce3a