Merge "Revert "Changed the ambient display setting name"" into oc-dev