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

* commit 'db9eca39e9cc1386b4c48300c294f0349c6d9762':