Merge "Dismiss dialog with Escape key if closeable" into main