Merge "Fix drawing of custom action label key" into lmp-dev