Merge "ChangeScreen2: allow edit commit message"