Merge "Remove hidden Icon.createWithResource API usage"