Merge "make Surface.java internal state thread-safe" into jb-mr2-dev