Improves tab switching and tab related perf #8863