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

Change-Id: Iae6cbee1ff7901bc36f38343e822b99063e8fe57