AUI-1584 Empty Surface screens are not being rendered on page refresh