Merge proposals dependent on lp:~mterry/ubuntu-app-launch/testing

lp:~mterry/ubuntu-app-launch/testing has no merge proposals.