Merge pull request from airbnb/f/v3.1.2 handle passing a sketch document more properly