Merge "Adding handle extra in unread-message broadcast"