Merge "Don't allow foreground notis to be blocked inline." into pi-dev