Merge "Removed sys-ui's use of static stack ids."