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

Change-Id: Iaf67b17836fc8d7194dc8da35494dfec57c3c1f9