Merge "Fixing missing user check when updating shortcuts for an app" into ub-launcher3-calgary