Merge "Clear identity when checking strongauth flags"