Merge "Drop String::empty()" into main