Merge "Add a null check for visibleFile." into oc-dev