Merge \"Updating the label for shortcuts aciton\" into ub-launcher3-calgary
am: 16c6d3abe4

Change-Id: Idda7b26aef5c133a51e234f2135fbd6cd4e5c828