Remove Settings overlay

Change-Id: Id2b5f662f0f5cbe8e340f2b299385cb942ca1ee3