Merge "Align shortcut text with view start." into ub-launcher3-calgary
am: 7b6e3aea31

Change-Id: I24cdbfdadd5d3c1d5469d0155c3eb006fac88714