Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev