Merge "Improve touch device configuration. Bug: 5064702"