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

Change-Id: I22892bf36a9782ef8ab90bd2e9d80935773e8622