Merge "QS + DND interaction again" into oc-dev
am: d84ff64f96

Change-Id: I0fa2650cb925001c0212b6d528184577f54451a2