Merge "Include owning uid in auth failure logs" into main