Merge proposals dependent on lp://qastaging/~thomir-deactivatedaccount/autopilot-qt/trunk-fix-failing-ap-tests

1. trunk-fix-failing-ap-tests
2. Dependent merge proposals