Merge "Fix the highlight error and remove the empty card" into sc-v2-dev