Merge "Fix deadlock of main thread and Perfetto thread (LayerDataSource::OnStart)" into main