Merge \"Match updated redlines for shortcuts.\" into ub-launcher3-calgary
am: cdef9dd35d

Change-Id: Ia402be24bf751dcca961e417a4c6a30b7dd741f9