Resolve differences
Merge branch 'fix_activity_lifecycle' of https://github.com/ericedens/FirefoxSearch into fix_activity_lifecycle
Resolve differences