Merge "DO NOT MERGE Use round highlight for navigation buttons" into rvc-qpr-dev