Fix switch change notifications.
Merge pull request #1473 from guardian/switch-notifications

Fix switch change notifications.