Merge "goldfish: switch to NR_NSA for 5G" into rvc-dev