Merge "For NR (non-standalone), use LTE signal strength as primary rule" into rvc-dev