Settings: merge fix

Change-Id: If76a4998155bc87d185aa4d29581293f68470a52