Merge "Don't show the shade background for heads up notifications" into nyc-dev