Merge "Fix scaling of batched motion events." into honeycomb-mr2