Merge pull request #224 from bhariharan/unstable

Prevent new passcode activity from being created when one exists in the stack
Make 'touch' the default display param, fix typo, and rename string according to SDK naming conventions