Merge pull request #223 from bhariharan/unstable20

Merge branch 'unstable' into unstable20
Prevent new passcode activity from being created when one exists in the stack
Merge pull request #224 from bhariharan/unstable

Prevent new passcode activity from being created when one exists in the stack
Merge branch 'unstable' into unstable20