Merge "Add ambient notifications as inline setting." into oc-dr1-dev