Merge "Fix current tab is changed when rotating device" am: 3d8b442e8d
am: 35a3260b91

Change-Id: I1ae5051dfb35d75c99d0d44ce2689b6e81d47a81