Merge "Revert "Temporarily turn on callstack logging""