Merge "Cleanup QS dialogs" into oc-dr1-dev am: cb5e0e63b4
am: 49ade8dc97

Change-Id: I59c1c114355a6e416b0ecba515e340e8c7e65668