am dba56d08: am 2b030fd2: Merge "Persist list of shortcuts to install on home workspace" into jb-mr2-dev

* commit 'dba56d0812f3f769c7006b65ee27b920bc4f2672':
  Persist list of shortcuts to install on home workspace