Set the position of display settings to match ULS

Bug: 47822
Change-Id: I7b04a831b2c5d7932564a3cdde94be0e233f7a7b
Merge "Set the position of display settings to match ULS"