Settings: Some House Keeping

Change-Id: I79c61bf52f5d54f13241b82889c941b7fa5e0153