Merge "Bind color option selection border color (2/2)" into main