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

Change-Id: I899c1828eba2401ed67c4276c4eb3cf1bedc35f5