Merge "Add NPE check for refreshUi" into oc-dev