Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1