Merge "TIF: Move watch history logging to TvProvider" into lmp-dev