Settings: Cleanup display settings code #2

(cherry picked from commit 04280861beb5999aa00f056c46c0eb5f2f46dc0c)