Merge "Handle theme resources in ResourceRepository.hasResourceItem"