Merge "Minor fixes on ContentCapture session logic."