Merge "Fix NPE when ranking update causes reinflation" into rvc-dev