Don't include inter-page navigation in history

Fixes #2829
Merge branch 'staging'