Merge \"Showing the shortcuts in the disabled state and removing ti from the menu when its disabled\" into ub-launcher3-calgary
am: 55f5bd730c

Change-Id: I94d2deab5f6d0ba40965185d4132cb41ab340069