Merge "Switch remaining atrace calls to use sf specific macro" into main