Merge "Fix sensitive notification flag secure on resume" into main