Merge "Camera: Fix OutputConfiguration parcel order" into main