Merge "New constant for new settings screen." into oc-dev