Merge proposals dependent on lp://staging/~niels-avonds/beat-box/bug914241

lp://staging/~niels-avonds/beat-box/bug914241 has no merge proposals.