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

Change-Id: Id110913cd7d321f97397e591c09fa74f027c9970