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

Change-Id: I66bd25403a86faf8f8b269cb8ccd7150b82eec0c