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