Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev