Fix tvshow watch indicators being incorrectly set; set episode watched
meta based on metahandler data
Merge branch 'master' into 2.6.0