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