Merge "Merge "Cleanup QS dialogs" into oc-dr1-dev am: cb5e0e63 am: 41f4ab44" into oc-mr1-dev-plus-aosp