Merge "Fix reference leak on TvInputManagerService"