am e4a29ba9: Merge "Fix the NPE in onPause()." into ics-mr0

* commit 'e4a29ba9b6e04a0e708d3653ecba927968d8da59':
  Fix the NPE in onPause().