Merge "On strongAuthChanges, update fp & face states"