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

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