Merge "Do some additional cleanup when switching handlers" into sc-dev