Merge "Apply satellite feature flag to Settings activity" into main