Merge "Fix position of gentle notif header after dismiss peoplehub"