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

Change-Id: Iade8f76803a172b96eea3e2f3b330c21c4653464