Merge "camera2: skip capture result after clearZslQueue" into lmp-dev