Updated viewWillDisappear
Merged