Merge "Move timing code out of the try/catch in doPostOutputShutdown()"