Merge "Use shortcut disabled message if available." into ub-launcher3-calgary
am: 37aba27bbc

Change-Id: If5252961f47f281cfe549144b257561e82828e51