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