This reverts commit 4efd4231. We now don't store the extra view visible status, so the problem this change fixed is gone. And this change caused other focus issues, as per bug 607060.