Fix activity lifecycle issues.
Merge branch 'activity_lifecycle' of https://github.com/ericedens/FirefoxSearch into activity_lifecycle

Conflicts:
	app/src/main/java/org/mozilla/search/MainActivity.java