Fix wifi country code (1/2)

we were missing parts of code

Change-Id: I79f7b3b9db25afee51355ed8775e129afde35fa5
Signed-off-by: Dan Trifan <jimsth@gmail.com>
fix a potential memory leak by adding onDestroy in case settings is killed

Change-Id: Ie5f53969d583a898739caeec49b972c5e1cb69d9