am 2aef617f: am bb8cc37e: Merge "Don\'t forget header momentum upon scroll events" into lmp-dev

* commit '2aef617f4afac074288818f6a63238fb836df361':