Merge "Guard against null clipdata objects." into nyc-dev