Merge "Satellite: Only show device based satellite icon when flag is enabled" into main