New York lawmakers give final OK to expanded gun controls