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

* commit '8b5274e787f721a0e586e7dc7b44e40e7a47a9e0':