Merge "Don't reset modes when nested scrolling stops" into lmp-mr1-ub-dev