Merge "Refactor TvRemoteService."