Merge "Slight generalization of task view hit test logic"