am 4126693b: Merge "Disable RenderThread"

* commit '4126693be37244116d23e9c6dce2a15b88ad988f':
  Disable RenderThread