Merge "Inherit theme colorControlHighlight" into sc-dev