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