Merge "Log sensitive notification adjustments" into main