Window activation cleanups.

5 files changed