Merge pull request #4222 from SeannyM/android-portrait-scale Android: scale buttons based on smaller screen dimension
