Merge "Camera3Device: Fix high speed configuration" into mnc-dev