Merge "Add NPE check for prediction controller" into rvc-dev