Merge "PropertyProvider: remove unnecessary string copy" into main