Merge "Make PointerLocationView also log generic motions and some keys.  (DO NOT MERGE)" into honeycomb-mr1