Merge "Enables/disables shortcut view by config." am: 614db2e243
am: 9bc0bb7602

Change-Id: I618ca93be33ff532f1e20e44b2a1775108ebbec2