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

* commit '011639a83e46908134416a8f7e1686dc7852d17d':