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