Merge "Update Notification.shortCriticalText doc to recommend 7 chars, not 5." into main