Merge proposals dependent on lp://qastaging/firefox/trunk

lp://qastaging/firefox/trunk has no merge proposals.