Merge "Fix NPE in updateNrState" into rvc-dev