[BUG #7138] Allow disabling of dynamic theme change