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

* commit 'b4499a1e0e65413319b233076c4d2276a7c7492a':