Added more null checks, to avoid un-caught exceptions
Added SubActivity to demo returning to an Activity from the Notification