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

Change-Id: I21408b9e8451595d9bf16e2123eda7fc3e75fa9a