Merge "Really make Surface thread-safe." into jb-mr2-dev