Merge "Update lint baseline for vFRC" into main