Merge "Changed the ambient display setting name"