Merge "Empty toast should not be displayed"