Merge "Allow touchpads to expose associated display" into main