Nux

Merge proposals dependent on lp://qastaging/~gordallott/nux/fix-text-entry-painting

lp://qastaging/~gordallott/nux/fix-text-entry-painting has no merge proposals.