Merge "Keep the dialog when touching outside the window" into main