Bring Back Device Settings

P.S.2 Move overlay to common.
P.S.3 Remove Whitespace.
P.S.4 Move Package to build to common.

Change-Id: I1644f286ed0722b48c17a6be31b1201b4c804729