Merge proposals dependent on lp://qastaging/~laney/rhythmbox/rb-2.97-update

lp://qastaging/~laney/rhythmbox/rb-2.97-update has no merge proposals.