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