Finish initial page loading behavior
Merge branch 'back-button' into development