Fix clearsSelectionOnViewWillAppear