The following patches: * Apply the suggestions we got from upstream so far. * Cleanup code. --- Nelson Castillo (3): Fix touchscreen filter includes Move touchscreen filter includes Miscellaneous touchscreen filter cleanup