Merge "Do not attempt to decode  NULL SkData." into klp-dev