Merge "Revert "Make EmailActivity the default activity.""