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
Merge pull request #225 from bhariharan/unstable20

Merge 'unstable' into unstable20