Merge "Revert "Add a new warning dialog for Satellite mode"" into 24D1-dev