Merge "New constant for new settings screen." into oc-dev
am: 04225787d8

Change-Id: Ie4d14f5f2954c40dcdedac8dd028e31d380eb881