Settings: merge fix

Change-Id: Id34045935e02a4f12876f7b850ec84441e5752e5