Merge "Fix failed UI test"