Avoid removing switch even listener multiple times

- Fix b/16118646

Change-Id: I36cdc5c8d98dfb63924737af40efff35b9ca2e66
1 file changed