Merge "Fix hardware TvInputService binding issue"