Merge "Revert "Camera2: Fix HDR and ZSL conflict""