Merge "Add rotary highlight to switches" into rvc-qpr-dev