Merge "Fixed startActivity() Bug in LaunchActivityTest"