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

Change-Id: I2c9878f72b9beb7c2c039d3f58c843fa692e02d5