Merge "LabelDecorator.decorateLabel can return null"