Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1