Merge "Camera2: improve ZSL candidate selection logic" into lmp-dev