Merge "Allow vendor_init to set the touch properties"