Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala