Add back Device Settings overlays

Change-Id: I532331b806b53aae7fefe6f7e237368ad2df33f5