Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev