Merge "UI refinement of highlighted menu entry for large screen" into sc-v2-dev