disable playback of deleted videos in media viewer
Merge remote-tracking branch 'upstream/master'