Merge "Fix tooltip handling for invisible and overlapping views"