Passcode inactivity expiration not in sync with timer
Merge pull request #566 from khawkins/fix_inactivity_expiration

Fix inactivity expiration