Merge "Revert "Remove dynamic location settings footer"" into sc-dev