Merge changes I70be889f,I81e7a459 into s

* changes:
  vendor: props: Don't write binary XML files
  vendor: Enable one-handed mode