Merge "Make toggle button use rectangular focus highlight" into rvc-qpr-dev