Merge proposals dependent on lp://staging/~dobey/ubuntuone-client/fix-fsm-draw

lp://staging/~dobey/ubuntuone-client/fix-fsm-draw has no merge proposals.