Merge "Add systrace dump to the critical section of the bugreport"