Merge "Don't save scroll position inside nested scroller" into lmp-dev