Merge "Disable resource multilocale support" into main