Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev