Merge "[Internal cleanup] remove warning message for resource ID" into main