Merge "Touch is not working"