Merge proposals dependent on lp://qastaging/~zyga/checkbox/rework

lp://qastaging/~zyga/checkbox/rework has no merge proposals.