Merge "[controlbar] fix TC build error"