Merge "Fixed a bug where the notification header was above the guts"