Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev