Merge "Create a draft patch set when a draft patch set is rebased" into stable-2.5