Merge "Double check the layout test running on UI thread"