Merge \"Use the shortcut\'s long label in the container, if it is available.\" into ub-launcher3-calgary
am: 50f251bfc8

Change-Id: I788e97bcef428dd776fbf6a734274626a24c1c6a