am 17cf4e4d: Merge "Really make Surface thread-safe." into jb-mr2-dev

* commit '17cf4e4d4a576009efbfce93bd64b687601b71c7':
  Really make Surface thread-safe.