Merge "Unregister the dialog listener on detached" into sc-v2-dev