Merge AuthenticatedWebViewActivity and DotComAuthenticatedWebViewActivity in one single activity. Fix for #1876