Merge proposals dependent on lp://qastaging/~michael.nelson/ubuntu-webcatalog/962140-display-video-demos-pt-2

1. 962140-display-video-demos-pt-2
2. Dependent merge proposals