Merge "Update logic for interruptive notifications" into pi-dev