Merge "Fix TvRemoteProvider NullPointer bug"