Merge "Log package name of calling uid when throwing" into main