Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-burnaby