am 43a760ba: Merge "Don\'t crash on Surface.unlockAndPost() but log & try again Bug #6482593" into jb-dev

* commit '43a760ba84a5357bae792a33ad4a0e946f02679c':
  Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593