Merge "Add TOUCH_FOCUSABLE property" into devel/master