Merge "Camera2: Fix segfault when control fields were omitted in metadata"