Merge proposals dependent on lp://staging/~gonzalo-bulnes/infusion/ui-refactoring

lp://staging/~gonzalo-bulnes/infusion/ui-refactoring has no merge proposals.