Merge "Defines flag to disable touch feedback on display" into tm-dev