Merge \"Fixing missing user check when updating shortcuts for an app\" into ub-launcher3-calgary
am: 2eeae10e98

Change-Id: I2104d62e98f588d007cc73fecb4596630fa607d0