Merge "SF: Confine display serial number to EDID parser" into rvc-dev