am 8bd49e40: Merge "Don\'t save scroll position inside nested scroller" into lmp-dev

* commit '8bd49e409ec5c4e487fa03d20140121501477e48':
  Don't save scroll position inside nested scroller