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

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