Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"