Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread