Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev