Merge "Stop disabling the UnavailableSymbol check" into main