am 55b34750: Reconcile with ics-factoryrom-release

* commit '55b347501bd46eb1dc66dafafce73e6b9c834a78':
  DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.