am 2a1be7a6: Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-burnaby

* commit '2a1be7a6165b49d21396bcb228a468bc79dd4d3e':
  Fixing shortcuts not getting migrated to app icons