Merge "Fix test failure due to out of UI thread runnning."