Merge "Re-order the display settings items." into oc-dev
am: 5a03e321bc

Change-Id: Icf9d83dba0422af57fdd5dd7b7a158ed900ee08f