Merge "Refactor AppNotificationRepository"