Adding sync of watching history.
Merge branch 'master' into dev