Merge "Make logout notification string shorter"