Merge proposals dependent on lp://qastaging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1340227-expandable_autopilot_helper

1. fix1340227-expandable_autopilot_helper
2. Dependent merge proposals