Merge "Change TOUCH_AREA to TOUCH_AREA_OFFSET" into devel/master