Merge "Strings for "Data during calls" preference" into qt-dev am: 27de8ae098
am: 7e155aa244

Change-Id: I04bd89746b5cd98c5e3837212b7e29cd7daafb2b