Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
am: 5d1c65971f

Change-Id: I7fd206511601b378b17c042c23a4a761b212241a