Add Troy Kisky changes from Boundary Devices to address touch screen freeze
Remove Rafael's chnages to correct touch screen firmware issue