Merge "Changed to not always clearFocus when a touch occurs." into devel/master