Merge "Camera1 shim: If there's no flash, the keys need to be null." into lmp-dev