Merge "Fix a bug: unable to start activity when AM is killing the process."