Merge "Support DISABLING_SATELLITE state in satellite state machine" into 24D1-dev