Updates to improve App startup/resume notification behaviour