Merge "Waiting for Overview state when closing SelectModeButtons via Esc" into main