Merge "ChangeScreen2: turn it to be the default change screen"