Merge "Fix pointer icon handling for invisible and overlapping views"