Merge "Merge deep shortcuts in rounded rect" into ub-launcher3-dorval