Merge "Revert^2 "Remove call to Log.wtf that causes jank"" into main