Merge "Add mms preference and controller" into qt-dev am: f3365e911d
am: 7ec9c1db1d

Change-Id: I6a18373e1567d332a8a6a74c8449fc9ec9d28698