Merge changes from topic "flicker-move"

* changes:
  Fix surface tracing thread sync issues
  Fix locking issues with proto dumps