fix settings screen size for different devices
Merge remote-tracking branch 'origin/master'