Merge "Mobile network settings: Keep current tab visible after screen rotation" am: 10cc41124b
am: b06cfd620c

Change-Id: I97e7f22712e801bda85b8fa925c3938ba9729b84