Merge "Camera metadata: Check for inconsistent data count" into nyc-bugfix-release