In progress, deal with close-down after onSaveInstanceState