[#2188709] mkalkbrenner: 'Retain the theme until a new theme is set' doesn't work for static/triggered rules