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

* commit '7f8501867e488c2936366c2db2a48d2c6f200de3':