Merge "Handling the notification for custom ObjectAdapter case."