Improvements and fixes to offline watching (as well as a small fix to the movie discovery fragment).