Merge "Don't overtrigger face auth (ie: goingToSleep, lockdown)" into tm-dev