[2/2] Settings: Bring back OmniGears

Change-Id: I093e28047919ec31273d690ed286e592ec1a1567
12 files changed