Merge "API Review: InputConnection error handling is inconsistent"