Merge "[Contextual Edu] Dismiss the existing dialog when a new dialog is shown" into main