am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev

* commit 'c7b8858ec1b3b0c4f09a3f55281a3aaa9f97c58d':
  Refactor action label/icon definitions