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