Merge "Waiting for Normal state when closing Overview by touch" into main