Merge "Added Night Light Suggestion and tests" into oc-dev