Merge "Update focus highlight of car dialog button" into rvc-dev