Merge pull request #386 from bhariharan/unstable

Merge branch 'master' into unstable
Fix for 4.3 passcode.
Merge branch 'master' into unstable
Fix for passcode screen not always being the topmost screen