am 163994c1: am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1

* commit '163994c1d4206813f621bad04b808d08f753fb7d':
  Revert change to setInitialScale() to take display density into account.