Fix bug with removed contentview being the active content view