Backport patch from mart/LookAndFeelKCM