Merge "Move PointerController from sp to shared_ptr"