Merge "Merge deep shortcuts in rounded rect" into ub-launcher3-dorval
am: 12fec49834

Change-Id: I7662f40eade7665f2aa1aba2e341c4ed126a8f14