Merge "Prevent Resources$NotFoundException when loading resources by string" into main