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

Change-Id: I0c6f7f8239051005e3b4415a69102ccb0b5c48d2