Merge "Update focus highlight" into rvc-qpr-dev