Merge "Swap isset by null check in ApiSetNotificationTimestamp/ApiPurge"