Merge "Fixed NPE when pause is complete on a dead app." into nyc-mr1-dev am: 5db4e723cd
am: 59aa02749c

Change-Id: Ide8d9381f240fd21deaace0b74ba3fb1f5853024