Merge "Introduce hidden logging API for restriction types and reasons" into main