Merge pull request #402 from khawkins/unstable

Mobile SDK: master to unstable merge
Missed QuartzCore.h for forgot passcode button changes
Merge pull request #403 from khawkins/missing_import

Missed QuartzCore.h for forgot passcode button changes
Merge remote-tracking branch 'upstream/master' into unstable