Merge "Add a system property test before scanning touch video devices."