Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo