Fix merge of stashed changes.
DNN-5048 Improve Basic Page Performance - 4 - Reduce HTML Rendered in View mode