Fix extra_blank_blocking_other_windows

tower: https://tower.im/projects/15081ba156b14fa4bd6d9e82f91edff3/todos/ee1d5b11abee41a5b4063f239c0f3a57/

Change-Id: I8090ad01d07af1236285bdb0023536c130938c27