Merge "fix scroll offset when loading non-header pages" into lmp-dev