OIF-qml

Merge proposals dependent on lp://staging/~chasedouglas/oif-qml/no-touchscreen-conversion

  1. no-touchscreen-conversion
  2. Dependent merge proposals

lp://staging/~chasedouglas/oif-qml/no-touchscreen-conversion has no merge proposals.