Merge "Fix two StrictMode stack collection bugs."