Add state marker to prompt while cherry pick is in progress