Merge "Fixed LoginActivityTest.testCancellationSignalCalledAfterTimeout()" into pi-dev