Merge "GetActiveNotifications should never return null" into pi-dev