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

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