Merge "Fix of tearDown() in SingleLaunchActivityTestCase."