Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev