am e31634e9: am a4b0e559: Merge "Use a larger scaling span for larger screen...
am e31634e9: am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev
* commit 'e31634e9':
Use a larger scaling span for larger screen devices.