Merge "Camera2: Minor update for hyperfocalDistance spec"