Remove OmniGears overlay, move to Settings

Change-Id: I3e090b6fea854beabb2968a4887f23cefc6988f5