am 15b65884: Merge "Correctly set visibility of reused shortcut card" into lmp-mr1-dev

* commit '15b658841bd2f289dc79a733ec5f9df497e6239e':
  Correctly set visibility of reused shortcut card