Get back to stable state re: touchscreen s2w/etc

Change-Id: I86027011261f86597d6e6608734e6efc8793832d