More code cleaning
Changed the timing of notifications via the handler and control events so that the switches' animation can complete before the notifications are sent. This resolves the issue of the switches' parent view being animated while the switch itself is still mid-animation.