Merge "Fixed a racecondition when creating notification headers"