Merge "Fixed RebaseDialog usability improvements"