Merge "Always execute onStop and onSaveInstanceState together"