In adjust_frame_size don't count minibuffer height twice (Bug#21643)