Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev