Merge proposals dependent on lp:~chris.gagnon/gallery-app/autopilot-fix-flakyness-and-make-work-on-desktop

1. autopilot-fix-flakyness-and-make-work-on-desktop
2. Dependent merge proposals