Merge "Rework activity lifecycle so onSaveInstanceState() is after onPause()."