Merge \"Set shortcuts arrow pivot to side connected to container.\" into ub-launcher3-calgary
am: 1460475626

Change-Id: I9bf77425b52b74c3904d5fcb41ef7a233bbc5253