Merge "Thread: Add safety annotations for methods" into main