Merge "Modifying shortcut display names to be more descriptive" into nyc-dev
am: 2cdfdcbbc5

* commit '2cdfdcbbc5faad800856ba430f7a13d839ad2f9d':
  Modifying shortcut display names to be more descriptive
tree: d5aab9908a4997af3632ae81dab977070f362812
  1. res-common/
  2. src/
  3. tests/