Merge "Binder: move Trace to OS module" into main