Merge "Add DISABLING_SATELLITE state" into 24D1-dev