am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1

* commit '7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
  Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121