am 16fe1dfd: Merge "Updating shourcuts only when the corresponding user also matches the AppInfo" into ub-now-porkchop

* commit '16fe1dfd30ee44be2c7c7f67b680afce875a3c3d':
  Updating shourcuts only when the corresponding user also matches the AppInfo