Merge proposals dependent on lp://qastaging/~paulvt/moovida/youtube-fix

lp://qastaging/~paulvt/moovida/youtube-fix has no merge proposals.