Merge "Add rebase button to the change screen"