Merge "Shift responsibility of DB cleanup to TvProvider"