Merge "heads up notifications, v0.1"