Merge "Camera2: fix high speed output surface format check" into mnc-dev