Merge pull request #225 from bhariharan/unstable20

Merge 'unstable' into unstable20
Make 'touch' the default display param, fix typo, and rename string according to SDK naming conventions
Rollback typo change
Merge pull request #226 from bhariharan/unstable

Make 'touch' the default display param, fix typo, and rename string according to SDK naming conventions
Merge branch 'unstable' into unstable20