Merge "Fixed that notification stacks could overlap weirdly"