Merge "Dismiss the open dialog if preference is disabled" into main