Bug 1074703 - [ValueSelector] Ensure window listener is removed on destroy