Merge "Do not apply legacy treatment on shortcuts Bug: 62617041" into ub-launcher3-dorval-polish
am: 3fede16f22

Change-Id: I64360a64a41dec7fd10894e5e91bdc6afc224a22