Merge "Move PointerController from sp to shared_ptr" into rvc-dev-plus-aosp