Merge "Switch order of onSaveInstanceState and onStop"