Merge "Fixed NPE when pause is complete on a dead app." into nyc-mr1-dev am: 5db4e723 am: 59aa0274 am: ef400a48 Change-Id: I951e9215e9edc96a937e053bb8a388954ec412ba