Merge "Fix tuner DND UI" into oc-mr1-dev