Merge "Hold a weak reference to PointerController when handling vsync" into nyc-mr1-dev