Merge "[ActivityManager] Do not finish root activity when reset task"