Merge "Avoid removing switch even listener multiple times" into lmp-dev