Merge "Re-order the display settings items." into oc-dev