Settings: fix NPE

Change-Id: I483c530ce121051ada0bc91c406927d9171f5c4d
Settings: package move

Change-Id: I201db4fe3ed98eb1d8be348964d2f2323fcc90ba