Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev