unity-mir

Merge proposals dependent on lp://qastaging/~gerboland/unity-mir/demo-stuff-manta-osk-fix

  1. demo-stuff-manta-osk-fix
  2. Dependent merge proposals

lp://qastaging/~gerboland/unity-mir/demo-stuff-manta-osk-fix has no merge proposals.