Merge "Clear calling identity when checking if NLS is trusted" into main