Merge "Change color of seamless chip border" into rvc-dev