Merge "Handle multithreading in ActiveGestureLog" into main