Merge "Improved notification interruptiveness calculation." into pi-dev