Apple back in top spot as Samsung battles brands from China