Fix the bug that Switch doesn't propagate 'unsubscribe'
Merge pull request #1667 from zsxwing/fix-switch

Fix the bug that Switch doesn't propagate 'unsubscribe'