Bug 830644 - [Settings] Support High resolution devices

tidied up from Ismael's repo.