Merge proposals dependent on lp://staging/~zyga/checkbox/fix-1480473

lp://staging/~zyga/checkbox/fix-1480473 has no merge proposals.