Merge "Fixes SparseSetArray#add return logic"