Merge "Cleanup QS dialogs" into oc-dr1-dev