am e7889d23: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'e7889d237cbcf59d7b50aa1511e06a4de04b351e':
  Use focal point for scrolling.
  Use a local copy of HorizontalScrolllView.