Settings: clean up warnings

rebase

Change-Id: Ib39d58da40a9b3657358223886cecf4f0543e0e3