am 4cbfee7a: am c5a8bc61: am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev

* commit '4cbfee7a412838bbb285b690d36fcc7a3e7d8350':
  Fix drawing of custom action label key