Merge "StrictMode: more accurate timings"