Merge "Fix flaky test of LoginActivityTest"