Merge "Don't autogroup critical notifications"