Merge "Fix the highlight error after unfolding the device" into sc-v2-dev