Merge "ACameraCaptureSession_setWindowPreparedCallback API council feedback" into udc-dev