Merge "Fix TvInputService#verifyCallbackError failure"