Fix close button behavior for editors after switching

Make sure that even if you switch back and forth between editors,
when you click the close box, it closes the overlay entirely
rather than taking you to the previous editor.

Change-Id: Ie202d6abe33a81fa9687a20851a8f699b913e531
Merge "Fix close button behavior for editors after switching"