Merge changes I6823a613,I7763b473

* changes:
  Fixed a bug where the low-priority header wasn't cleared
  Fixes an issue where the notification header could be invisible