Merge proposals dependent on lp://staging/~markellmtthw/beat-box/fix-920012

lp://staging/~markellmtthw/beat-box/fix-920012 has no merge proposals.