* Fix flashing on reapplying theme

This seem to be making a difference on staging

* Add `blocking="rendering"` attribute