Video sprint39

All the work done in video sprint 39 (besides the video page tool work).  Each PR into this branch was code reviewed individually.