Merge proposals dependent on lp:~mhr3/unity/fix-ap-preview-tests

lp:~mhr3/unity/fix-ap-preview-tests has no merge proposals.