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