Merge "Update old stack check for finding recent task index to remove" into pi-dev