am 99567d89: am feddb49c: Merge "Fix shortcut action text length issues." into mnc-dev

* commit '99567d899eb9b794fe97bf8ff1961fc191119c9a':
  Fix shortcut action text length issues.