Merge "Revert "Disable adding main and non moving spaces to immune region in GSS"" into lmp-dev