am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when...
am cdf8fe86: am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit
* commit 'cdf8fe86':
Do not allow duplicate shortcuts when ALL_APPS is disabled.