Merge "CDD: Relax Notification Listener requirement for low RAM" into oc-mr1-dev