AUI-1173 Manual backport to sync aui-surface with master.

Prefetch (AUI-1670)
Popstate AUI-1419
Source formatting