Merge "Use ActivityScenario to test onSaveInstanceState"