Merge "Fix NPE at RadioInfo" into main