Merge proposals dependent on lp:~om26er/ubuntu-ui-toolkit/autopilot_emulators_fix

lp:~om26er/ubuntu-ui-toolkit/autopilot_emulators_fix has no merge proposals.