Updated viewWillDisappear