Merge "Clean up satellite pointing APIs"