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

Change-Id: Icabaab149f5fbe5d816cd7b8d440ff5593fa4e3b