Merge "Additional refactoring of TvRemoteService"