Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev