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