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

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