Merge "Add ESCAPE key to dismiss Overview" into main