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

Change-Id: I953b719e40c99c74768f2cf9bca660d966c6636f