Fix Mms preferences merge derps

merege went fine only preferences were partly messed up

Change-Id: Id385b898f4b8cae11b16bb7debf38063b600a7d3