More comprehensive solution to issue of iframes not getting content scripts re-injected