Merge "TouchpadInputMapper: bump generation on display change" into main