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

* commit 'edfc8daed9ab32b225fa6e83460e6cc376623879':
  Fix drawing of custom action label key