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

* commit '4824965fc5b403d3ca5018f65077d953e3b80b42':