Add missing calls to cleanup code in NIToolbarPhotoViewController