Merge "[Contextual Edu] Show dialog after back gesture completed" into main