Merge "Let InputReaderContext hold a single PointerController"