Merge "Fix AbortLogin hook return value check"