Merge "Adding "empty" message in empty state"