Merge "Update logic for interruptive notifications" into pi-dev
am: 618033a1c7

Change-Id: I6d081459b209f403129d3786af6ccd4b4d7843c8