Merge "Camera: Need consider AF state for ZSL buffer selection" into lmp-dev