Merge "Camera2: Minor docs fix." into klp-dev