Merge proposals dependent on lp://qastaging/~asac/ubufox/main

lp://qastaging/~asac/ubufox/main has no merge proposals.