Merge "ChangeScreen2: Make the selected tab stay"