Merge "Fixed Settings Cellular Networks crash." into lmp-dev