Merge "[CDM] Dismiss association dialog onDestroy rather than onStop." into main