Merge "DO NOT MERGE - Changed WebViewActivityTest to set the service before the activity is launched."