am 274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1

* commit '274133dfef84f93de349fcd34919f4df32279e8a':
  Fix setInitialScale() to take display density into account.