Merge "Fix heads up notifications"