Merge "Clean up ImageReader when VrMode is disabled." into oc-dev