Merging unstable into unstable20

Passcodes and Cordova bugs and identity, oh my.