Merge "Remove unused StackHandleScope"