Merge "Removed remaining use of static stack ids."