Merge "Don't delete legacy shortcuts in loadWorkspace()" into ub-launcher3-dorval
am: 23cae10576

Change-Id: Icb8b72be29249e5df4505bb02c75c6f2a90d6bee