Merge "Fix testcase error and UI refresh issue"