Merge "Camera2: Add user tag to CaptureRequest" into klp-dev