am 21abdd56: Merge "Fixed an issue were switching data roaming would disable other settings." into lmp-dev

* commit '21abdd568a4b7e96db4e3ae6c651be96c173d93b':
  Fixed an issue were switching data roaming would disable other settings.